From: Kenichi Handa <handa@m17n.org>
Date: Fri, 26 Nov 2010 07:52:56 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2495^2~4
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=18d934f31d89c445fb8bab7e41e0966c8c2a6e39;p=emacs.git

merge trunk
---

18d934f31d89c445fb8bab7e41e0966c8c2a6e39